Possible fix for #25