possible fix for #291, #293