Fix #25 - BadTokenException; Froyo and earlier