Objecthandler fix