Fixing Raygun