Fixed fire issue

Fixes #1745