Merge pull request #1921 from Azaezel/lostLast