Fix  for new Swift version