Handle start/end correctly