Fixing location assignment date logic.