Removed bug at firing