Workaround for GEOT-4803