Fixin TypeError