Fix/555

All credits go to @cvrebert, many thanks for logging the issue.