Fix/exercise problem

Merged Martin Schneider requested to merge fix/exercise-problem into master

Merge request reports