Issue #843: Hopefully real fix this time for single inheritance keys problem