GDS-1261: fix the previous fix...
GDS-1261: fix the previous fix...