fix for GDS-1261