Bugfix for object