Possible fix for #40.