Add return EOF if return in not existed