No more double firing