Fix  for new version of swift