Account for data length in all cases
Marking as 0.1.3