Remove Condition Statement fix