Fix for issue 66.