Fix property scope