Merge fixes #7
Hopefully fixes data