possible fix for #119