More robust property control