Type check fix