Possible fix for #31.