Fixing Improper Class Call