Close #389