Fixes: #443
rebased onto 5db6363cbc756c6d3b939e3ab7e8a8b68f7cb239
Pull-Request has been merged by abompard
Fixes: #443