Proper Fire ID checking. Fix #1756.