fix exception, and put