Fixing failing test
Merge pull request #509 from wpreul/bug/499

Fixing failing test