#23: Fixed Pistol handling as far as possible.