Fixes 558
:thumbsup: LGTM!
Commit 67b31c0a fixes this pull-request
Pull-Request has been merged by abompard
Fixes 558