Bugfix for key object