Property class fix