Fixes #507
rebased onto 3254d6bec4a0c1d05e633d381e775577eb884ff3
Pull-Request has been merged by pbokoc
Fixes #507