Fixed broken before loop option