Close #269 Close #270 Close #272