better fix for IDEA-125082