Dashboard error fix, take 2