added todos
GDA-6083 work round this issue