Fixes #506

Romolo is done with this one. Time to merge with next