Fix DATA Issue (imported from CM)