Better bug fix for AFDS course calculator crash bug