Fixed fire issue

Fixes #1745 
What about the last `true` parameter? It is not necessary now.