#516: add new rule and test
#516: fix test
Merge pull request #517 from mimmi20/issue-516

Fixes #516