Comment code and fix bug.