Bug fix where a zero in between data was causing problems