Close #1409