simplify previous patch