Fix for issue #393.