Fix data Part 2

Thanks @vm03