Fix for #144 - it's sooo confusing, the data parsing