Fix the fix

Adam Caprezrequested to merge
fix-the-fix into master

Merge request reports