diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index 7f5eb1a2031..e8cc400611e 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -4122,13 +4122,13 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
     }
 
     protected String generateTimeStamp() {
-        return new StringBuilder("CsCreateTime-").append(System.currentTimeMillis()).append("-").append(Rand.nextInt()).toString();
+        return new StringBuilder("CsCreateTime-").append(System.currentTimeMillis()).append("-").append(Rand.nextInt(Integer.MAX_VALUE)).toString();
     }
 
     protected Pair<Long, Integer> parseTimestamp(String timeStampStr) {
         String[] tokens = timeStampStr.split("-");
         assert (tokens.length == 3) : "It's our timestamp but it doesn't fit our format: " + timeStampStr;
-        if (!tokens[0].equals("CsCreateTime-")) {
+        if (!tokens[0].equals("CsCreateTime")) {
             return null;
         }
         return new Pair<Long, Integer>(Long.parseLong(tokens[1]), Integer.parseInt(tokens[2]));