Proposed netty fix