[fix] safety 0 termination. (extends this commit: 1eadbb996e6c7d271f1758975a91564f0abac1d0 )