Fixed #18 with token now according to spec