Fixing #75