fix for GDS-1262