possible fix for #39