Close #740