Fixing 5.3.3 inheritance issue.