Fix no current bug