Fixed name conflict with _property_lock