Fix for class method causing compilation & unit test error.