Refactored wrong property