Fix for #803
Oups