Possible fix for #5