Corrected the ClassRedefined issue