No more traitor gunners! (fixed #55)