fix for GEOT-4678