Remove potential erratic bug