Fix #908