Has one fix

Laurent requested to merge has_one_fix into master

Merge request reports