Close #26 PR: Workaround for EPEERINVALID error.