Close #416 Close #417