Fixed some exentsibility problem.