Conditions `with` issue fixed