diff --git a/src/qamqpchannel.cpp b/src/qamqpchannel.cpp
index a33dbd0..f20b1ae 100644
--- a/src/qamqpchannel.cpp
+++ b/src/qamqpchannel.cpp
@@ -6,7 +6,7 @@
 #include "qamqpclient.h"
 #include "qamqpclient_p.h"
 
-int QAmqpChannelPrivate::nextChannelNumber = 0;
+quint16 QAmqpChannelPrivate::nextChannelNumber = 0;
 QAmqpChannelPrivate::QAmqpChannelPrivate(QAmqpChannel *q)
     : channelNumber(0),
       opened(false),
@@ -33,7 +33,7 @@ void QAmqpChannelPrivate::init(int channel, QAmqpClient *c)
     client = c;
     needOpen = channel == -1 ? true : false;
     channelNumber = channel == -1 ? ++nextChannelNumber : channel;
-    nextChannelNumber = qMax(channelNumber, (nextChannelNumber + 1));
+    nextChannelNumber = qMax(channelNumber, nextChannelNumber);
 }
 
 bool QAmqpChannelPrivate::_q_method(const QAmqpMethodFrame &frame)
diff --git a/src/qamqpchannel_p.h b/src/qamqpchannel_p.h
index 372f386..7551950 100644
--- a/src/qamqpchannel_p.h
+++ b/src/qamqpchannel_p.h
@@ -60,8 +60,8 @@ public:
 
     QPointer<QAmqpClient> client;
     QString name;
-    int channelNumber;
-    static int nextChannelNumber;
+    quint16 channelNumber;
+    static quint16 nextChannelNumber;
     bool opened;
     bool needOpen;
 
diff --git a/src/qamqpframe.cpp b/src/qamqpframe.cpp
index 9c69805..a46d554 100644
--- a/src/qamqpframe.cpp
+++ b/src/qamqpframe.cpp
@@ -22,12 +22,12 @@ QAmqpFrame::~QAmqpFrame()
 {
 }
 
-void QAmqpFrame::setChannel(qint16 channel)
+void QAmqpFrame::setChannel(quint16 channel)
 {
     channel_ = channel;
 }
 
-qint16 QAmqpFrame::channel() const
+quint16 QAmqpFrame::channel() const
 {
     return channel_;
 }
diff --git a/src/qamqpframe_p.h b/src/qamqpframe_p.h
index a07e499..e81ef1b 100644
--- a/src/qamqpframe_p.h
+++ b/src/qamqpframe_p.h
@@ -39,8 +39,8 @@ public:
 
     FrameType type() const;
 
-    qint16 channel() const;
-    void setChannel(qint16 channel);
+    quint16 channel() const;
+    void setChannel(quint16 channel);
 
     virtual qint32 size() const;
 
@@ -56,7 +56,7 @@ protected:
 
 private:
     qint8 type_;
-    qint16 channel_;
+    quint16 channel_;
 
     friend QDataStream &operator<<(QDataStream &stream, const QAmqpFrame &frame);
     friend QDataStream &operator>>(QDataStream &stream, QAmqpFrame &frame);