simplify previous change to allow for more circumstances