Fixed fire issue

Fixes #1745 
Also, $update should be true?