fix for removing context and switching to first found