Added the stripping here to handle 'enabled = 1' cases.