Actually closed #896