Just Paste It

diff --git a/vm/builtin/regexp.cpp b/vm/builtin/regexp.cpp
index 4ff9159..858db2a 100644
--- a/vm/builtin/regexp.cpp
+++ b/vm/builtin/regexp.cpp
@@ -246,8 +246,8 @@ namespace rubinius {
     end = pat + pattern->size();
 
     opts  = options->to_native();
-    kcode = opts & KCODE_MASK;
-    opts &= OPTION_MASK;
+    kcode = opts & rb_const_get(rb_cRegexp, rb_intern("OPTION_MASK"));
+    opts &= rb_const_get(rb_cRegexp, rb_intern("OPTION_MASK"));
 
     if(kcode == 0) {
       enc = current_encoding(state);
@@ -299,11 +299,12 @@ namespace rubinius {
   }
 
   Object* Regexp::options(STATE) {
-    regex_t*       reg;
+    regex_t* reg;
+    int option_mask;
 
-    reg    = onig_data;
-
-    int result = ((int)onig_get_options(reg) & OPTION_MASK);
+    reg = onig_data;
+    option_mask = rb_const_get(rb_cRegexp, rb_intern("OPTION_MASK"));
+    int result = ((int)onig_get_options(reg) & option_mask);
 
     if(forced_encoding_) {
       result |= get_kcode_from_enc(onig_get_encoding(reg));