Merged Kristin Young's fix for #61.