CGIV-2206 minimising differences