integrate @ryanve commits
oops, need a var there to prevent leaking