Fix helped causing TypeError