Correct fix for tracker item 3298.

- As reported in tracker item 3298.

Progress towards: tracker item 3298