fix #1082

FIX: #1082, remove laps did not work
FIX: minor bug in previous commit (splits with two laps would have been
ignored)