fixed Firing bug