[BZ #2508]