small improvement, related to issue #940