Close #1548