Fix for issue 91.