Fixed bug with buffs and queue