CGIV-2253 bit of debug here to see what's going on