[Fix] Issue #980 final