Fixing source analysis