Please create a pull request (preferred) or attach a patch for a test that reproduces your issue.

You should be able to reproduce this using org.hibernate.test.annotations.override.AssociationOverrideTest.by adding another Map to PropertyRecord with a @MapKeyColumn, then adding some checks for appropriate column names to AssociationOverrideTest.