Added HasBuff check