Quiver Bug fixed

I don't know why these changes didn't make it in the first place ?