fix property resolution