20140715 bug\fix