Ayotte, Fixes #489