* fix ZSS-528.
* modify test case to avoid misunderstanding.
merge fix of ZSS-528 and test cases.