diff --git a/includes/core.php b/includes/core.php
index 87a2d78..15cd1b6 100644
--- a/includes/core.php
+++ b/includes/core.php
@@ -64,7 +64,7 @@ function gen_name($arg, $in){
         }
     switch($arg){
         case 'random':
-            return $name.'.'.$in;
+            return $name.($in === NULL ? '' : '.').$in;
             break;
         case 'custom_original':
             return $name.'_'.$in;