Fixed Some Serious Internal Bug