Attempt to solve inheritance problem.

Commit before leaving domitory.