Fixed add() and shift()