DONE:Data fix workaround