Possible fix for #49