Fix type stability