Fix find last message