Fix order of callbacks to make sure score is recalculated first thing