2 files changed, 4 insertions, 5 deletions
diff --git a/Changes b/Changes
index bf54b0d..b92b51d 100644
--- a/Changes
+++ b/Changes
@@ -2,6 +2,9 @@ Revision history for Package-Stash-XS
 
 {{$NEXT}}
 
+0.18  2011-01-05
+      - more correct validity test for scalars (rafl, Roland van Ipenburg)
+
 0.17  2010-11-16
       - bah, get rid of extra junk in the tarball
 
diff --git a/XS.xs b/XS.xs
index 5957b1a..a32ca45 100644
--- a/XS.xs
+++ b/XS.xs
@@ -213,11 +213,7 @@ int _valid_for_type(SV *value, vartype_t type)
 
     switch (type) {
     case VAR_SCALAR:
-        return sv_type == SVt_NULL ||
-               sv_type == SVt_IV   ||
-               sv_type == SVt_NV   ||
-               sv_type == SVt_PV   ||
-               sv_type == SVt_RV;
+        return SvROK(value) ? SvOK(SvRV(value)) : SvOK(value);
     case VAR_ARRAY:
         return sv_type == SVt_PVAV;
     case VAR_HASH: