Fixes #547
rebased onto c3793d7c5bb97e8be2bb824c346cf48449d79f0a
Pull-Request has been merged by pbokoc
Fixes #547