fix bug with multiple fire on one tick
Merge remote-tracking branch 'origin/master'