fixed some problems with re-firing