Bugfix for objects used as value