Fix aptitude resolution after picking class