Fix issue316 issue317 pull