fix subsequent fires