Possible fix for #27.