Possible fix for #18