Fixes #444
rebased onto b261e0a5b58086317ab633ff6a02ac1183600a78
Pull-Request has been merged by abompard
Fixes #444