Fix for pistol 2