Fix #4179

Wheel can now acept tokens