fix
fix
fix bug
fix bug
fix bug
fix bug
fix crash
merge from qii.