Fix #889