Made property retrieval more stable to fix bugs