Close #17, #39