Fixing #762