diff --git a/bwtsw2_core.c b/bwtsw2_core.c
index cc3dc63..846c184 100644
--- a/bwtsw2_core.c
+++ b/bwtsw2_core.c
@@ -474,7 +474,8 @@ bwtsw2_t **bsw2_core(const bntseq_t *bns, const bsw2opt_t *opt, const bwtl_t *ta
 	while (!stack_isempty(stack)) {
 		int old_n, tj;
 		bsw2entry_t *v;
-		uint32_t k, l, tcntk[4], tcntl[4];
+		uint32_t tcntk[4], tcntl[4];
+		bwtint_t k, l;
 
 		v = stack_pop(stack); old_n = v->n;
 		n_tot += v->n;
diff --git a/main.c b/main.c
index 5642ce1..ad3841f 100644
--- a/main.c
+++ b/main.c
@@ -4,7 +4,7 @@
 #include "utils.h"
 
 #ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "0.6.0-r54-dev"
+#define PACKAGE_VERSION "0.6.0-r55-dev"
 #endif
 
 static int usage()