Fix the bug TCT-156, 203