CGIV-2253 didn't close loop properly