Fix #940