Fix for the shotgun bug