Close #1336