Fixing missed inheritence.