Fix attempt...

see #660