Fixing source attributes