Index: trunk/xcache.c
===================================================================
--- trunk/xcache.c	(revision 196)
+++ trunk/xcache.c	(revision 200)
@@ -951,8 +951,8 @@
 		UNISW(NOTHING, data->type = b->key.type;)             \
 		if (UNISW(1, b->key.type == IS_STRING)) {             \
-			ZSTR_S(data->key)      = BUCKET_KEY(b);           \
+			ZSTR_S(data->key)      = BUCKET_KEY_S(b);          \
 		}                                                     \
 		else {                                                \
-			ZSTR_U(data->key)      = BUCKET_UKEY(b);          \
+			ZSTR_U(data->key)      = BUCKET_KEY_U(b);         \
 		}                                                     \
 		data->key_size   = b->nKeyLength;                     \