Fix type passing