Subclassing option was not read
Merge branch 'foxykeep'