Merge pull request #2375 from rpv-tomsk/small-fix