diff --git a/FL/core/pen_events.H b/FL/core/pen_events.H
index 48ce47034..8dc708325 100644
--- a/FL/core/pen_events.H
+++ b/FL/core/pen_events.H
@@ -301,7 +301,7 @@ FL_EXPORT extern Trait pen_traits(int pen_id = 0);
  \return true if any bit is set
  */
 inline bool pen_traits(Trait bits, int pen_id = 0) {
-  return ((pen_traits() & bits) != Trait::NONE);
+  return ((pen_traits(pen_id) & bits) != Trait::NONE);
 }
 
 /**
diff --git a/FL/names.h b/FL/names.h
index e2072e058..12880548b 100644
--- a/FL/names.h
+++ b/FL/names.h
@@ -82,6 +82,8 @@ static std::map<int, const char*> fl_eventnames = {
   { FL_APP_DEACTIVATE, "FL_APP_DEACTIVATE" },
   { Fl::Pen::DETECTED, "Fl::Pen::DETECTED" },
   { Fl::Pen::CHANGED, "Fl::Pen::CHANGED" },
+  { Fl::Pen::IN_RANGE, "Fl::Pen::IN_RANGE" },
+  { Fl::Pen::OUT_OF_RANGE, "Fl::Pen::OUT_OF_RANGE" },
   { Fl::Pen::ENTER, "Fl::Pen::ENTER" },
   { Fl::Pen::LEAVE, "Fl::Pen::LEAVE" },
   { Fl::Pen::TOUCH, "Fl::Pen::TOUCH" },