Fixed issue #3: Multi-segment data isn't supported