Fixed handling of object property