Fix #979