Fixed #983