Fixed incorrect property checking