Fixed #979