Testing fix for #316