fix for null tokens