Close #46