Fixed dashboard error, there could be a better solution!