Possible fix for #13