update 20140307 bug fixing