diff --git a/src/backends/hdf5.jl b/src/backends/hdf5.jl
index d8919942..2c6b3ecb 100644
--- a/src/backends/hdf5.jl
+++ b/src/backends/hdf5.jl
@@ -270,7 +270,7 @@ function _hdf5plot_writecount(grp, n::Int) #Write directly to group
 end
 function _hdf5plot_gwritefields(grp, k::String, v)
     grp = HDF5.g_create(grp, k)
-    for _k in fieldnames(v)
+    for _k in fieldnames(typeof(v))
         _v = getfield(v, _k)
         kstr = string(_k)
         _hdf5plot_gwrite(grp, kstr, _v)
diff --git a/src/themes.jl b/src/themes.jl
index 5d1c032f..8d79ae64 100644
--- a/src/themes.jl
+++ b/src/themes.jl
@@ -10,7 +10,7 @@ end
 
 function _get_defaults(s::Symbol)
     thm = PlotThemes._themes[s]
-    if :defaults in fieldnames(thm)
+    if :defaults in fieldnames(typeof(thm))
         return thm.defaults
     else # old PlotTheme type
         defaults = KW(