fixed breaking bug