Fixing for non-integer keys