attempted fix for #59