Fixing #64