Fixed Issue GEOS-6723