Applied patch for swift compatibility