simplify so as not to set properties 2 times #3307