Modernizer fix