TRAINING-27 - Fix