Merge branch 'fix/workouts' into 'master'

Fix workouts

See merge request !10
2 jobs for master in 3 minutes and 12 seconds