Untested fix for #55