[FOLD] Address Howard's comment