Fix the fix

Merged Adam Caprez requested to merge fix-the-fix into master

Merge request reports