IDEA-134737 (minimal fix)