Fix for overall values that might come from this function