Fixed wrapping to token