Fixed fire issue

Fixes #1745 
Wow, weird that there is five here.