Fixed issue with GH and TDS not being nullable