Initial fix attempt for #81.