Fixed a serious bug