Ben: trial fix with modernizer for no-touch