Potential fix for #43, also gets rid of machine-gun blaster.