Make take()/drop() not share state across calls (#155)

Make take()/drop() not share state across calls (#155) #171