About "Leave No One Behind" achievement

I saved everyone from Moonrise Tower prison (got the achievement) then I saved the Nightsong/Aylin and now it looks like the battle at Last Light Inn is not taking place, because Isobel directs me to Moonrise Tower. Can I still get the achievemenr "Leave No One Behind"? Or is the battle at LLI crucial for this achievement? Thanks in advance.