Fixes #829
rebased onto e5568ea8b4dc1f6170662d58e59c09984225357e
Thanks, Ben!
Pull-Request has been merged by pbokoc
Fixes #829