Fix for ticket #393.