Fixing modernizer #2