Fixes #860
rebased onto dc2718f766aa9133d260c5b9b548eec53c8a0762
Thanks!
Pull-Request has been merged by pbokoc
Fixes #860