Fixing #65