Close #1248