Possible fix for #4