Dirty fix for null track