Remove erroneous conditions that cause satProperty when it should not occur