Machine Gun Changes (fix)

should work ALONG with previous Machine Gun Changes commit