modified some fatal error