Fix for GEOT-4850