Bug fixed ZK-1729: Change generic code 

http://tracker.zkoss.org/browse/ZK-1729