Fix token initializer