Fixed getProperty/setProperty