Added a check for property