GDS-1063
GDS-1063 Previous fix was probably breaking some cases