property name fix; logic fix