Bugfix for empty keys