Fix type conflict