Another GEOT-3407 related fix