possible fix for #4