Fix Flex-138
Merge branch 'Fix-flex-138' of git://github.com/huangnoah/zk
fine tune bug flex-138