The fix may be easier than expected :p

see #473