Another attempted fix for #70