closed #860 closed #927