Fixed a Class Call bug and wrong filename