Close #489