fixed side effect of #77