Fix for issue 594.