attempted fix for #164