Close #309