Should finally fix the ability checking bug that I think has been going on for maybe years.