issue/2596 - shortening check