Fixing breaking bug