VK-Fixing the logic.