Possible fix for #2