NH: Fix for PK inheritance problem