Fixed bug with missing object fields