possible fix for #254