another fix to start/end tokens