Fix for #98.