diff --git a/lib/bottles.rb b/lib/bottles.rb
index 87d266a..f38640d 100644
--- a/lib/bottles.rb
+++ b/lib/bottles.rb
@@ -20,9 +20,9 @@ def verse(number)
 class BottleNumber
   def self.for(number)
     begin
-      const_get("BottleNumber#{number}")
+      const_get("#{self}#{number}")
     rescue NameError
-      BottleNumber
+      self
     end.new(number)
   end