Possible fix for #22