Fix issue with subclass ID key getting truncated