A bit better handling of the empty tokens