Fixed firing bug