Fixing issue with start/end calculation