Fixed the wrong array offsets.
Fixed conflict