Fixes #971 - tokens is an array