fix #9168: code cleaníng