Possible fix for #21