Toad fix burst only (old revived: needs careful review!)

Toad fix burst only (old revived: needs careful review!) #469