Fix #463 - account for step in xport json

Final element check changed from end to end-step