Close #27 and #28