Fixed #971