Hack around not doing the negative offset
Seems like the race condition is still there. Need to figure it out more clearly. See github bug #1 for my notes on this.