tzhang - recovery the previous little modify