[fix] final issue #980