Update for fix for issue 58