diff --git a/src/core/resolve.c b/src/core/resolve.c
index 7073a9a9e63..0daaa30910d 100644
--- a/src/core/resolve.c
+++ b/src/core/resolve.c
@@ -694,8 +694,8 @@ struct rdata* get_record(char* name, int type, int flags)
 {
 	int size;
 	int skip;
-	int qno, answers_no;
-	int i, r;
+	unsigned short qno, answers_no, r;
+	int i;
 	static union dns_query buff;
 	unsigned char* p;
 	unsigned char* end;