fix the public problem