Bug fixed B65-ZK-2028, B65-ZK-2019

http://tracker.zkoss.org/browse/ZK-2028
http://tracker.zkoss.org/browse/ZK-2019