Fixed bug with missing properties