Close #305