reverting changes for set property which were causing problems