Continued fixing code.