FIX: Still working on the xlast troubles - Found a likely fix