Athletics fix
Merge branch 'Aug-30-1045'