Fixed existing checking