property validation logic fix