Fixed #981