Fix for issue 59.