Close #267
Close #272