Tried to fix a serious bug