Fix #926