Commit before refactoring base class,  base class was changing.