possible fix for #212