apply patch for #63 #64

seems actually the patch is not applied