Close #488