minor changes to resolve propertynotfound type thing