Close #754. Hopefully.