2014-6-5-some-bug-fix