Fix for issue #398. Part 2.