Fixed #974