Fixed #980