#620 fixed failing test
Merge pull request #621 from joola/feature/#620

#620 fixed failing test