Fixes #550
rebased onto 2e13b536841c4f8753c527ab51cf9902b317a5d1
Pull-Request has been merged by pbokoc
Fixes #550