Addition to d2f111d: No need to check the properties twice each tick