Fixes #469
rebased onto 40ea1955c9cd850bb949cab1a590ac0432f39779
Pull-Request has been merged by pbokoc
Fixes #469