Import C343-14 fix from Grunthack.  Closes #12.