Geos 5705 - solution for 2.3.x