[BZ #6040]