Correction for #316