Close #267