Fixes #499
rebased onto 86a4c65ad8eb61e3b6484ab4e41982709582ad77
Pull-Request has been merged by pbokoc
Fixes #499