Re-added missing code