diff --git a/src/components.jl b/src/components.jl
index 081a21ba..4db24d37 100644
--- a/src/components.jl
+++ b/src/components.jl
@@ -450,7 +450,7 @@ function series_annotations(strs::AbstractVector, args...)
     scalefactor = (1,1)
     for arg in args
         if isa(arg, Shape) || (isa(arg, AbstractVector) && eltype(arg) == Shape)
-            shp = Union{Any, Nothing}()
+            shp = Union{Any, Nothing}(arg)
         elseif isa(arg, Font)
             fnt = arg
         elseif isa(arg, Symbol) && haskey(_shapes, arg)
diff --git a/src/plot.jl b/src/plot.jl
index c6b0ed5e..9cc907d5 100644
--- a/src/plot.jl
+++ b/src/plot.jl
@@ -14,9 +14,9 @@ function current()
     if isplotnull()
         error("No current plot/subplot")
     end
-    get(CURRENT_PLOT.nullableplot)
+    CURRENT_PLOT.nullableplot
 end
-current(plot::AbstractPlot) = (CURRENT_PLOT.nullableplot == nothing)
+current(plot::AbstractPlot) = (CURRENT_PLOT.nullableplot = plot)
 
 # ---------------------------------------------------------