Merge pull request #1363 from Rudloff/defense