Fixed broken current plots