End of fix :p

see #610