breaking bug fixed