attempted fix for #579