Attempt to fix #86.  I'm hoping someone can verify this for me.