diff --git a/src/rsb/converter/LongConverter.java b/src/rsb/converter/LongConverter.java
index 1522125..9d04ad2 100644
--- a/src/rsb/converter/LongConverter.java
+++ b/src/rsb/converter/LongConverter.java
@@ -77,11 +77,7 @@ public class LongConverter implements Converter<ByteBuffer> {
             final long value = (Long) data;
             final byte[] backing = new byte[BYTES_PER_INT];
             for (int i = 0; i < BYTES_PER_INT; ++i) {
-                // CHECKSTYLE.OFF: LineLength - no way to convince
-                // eclipse to wrap this
-                backing[i] =
-                        (byte) ((value & (MASK << (i * BYTE_LENGTH))) >> (i * BYTE_LENGTH));
-                // CHECKSTYLE.ON: LineLength
+                backing[i] = (byte) ((value >> (i * BYTE_LENGTH)) & MASK);
             }
             final ByteBuffer serialized = ByteBuffer.wrap(backing);
             return new WireContents<ByteBuffer>(serialized,
diff --git a/test/rsb/converter/LongConverterTest.java b/test/rsb/converter/LongConverterTest.java
index 9a2dc84..7a82035 100644
--- a/test/rsb/converter/LongConverterTest.java
+++ b/test/rsb/converter/LongConverterTest.java
@@ -72,7 +72,7 @@ public class LongConverterTest extends LoggingEnabled {
     public void roundtripLargeValue() throws Throwable {
         final LongConverter converter =
                 new LongConverter(LongConverter.UINT64_SIGNATURE);
-        final Long input = 130236144L;
+        final Long input = 6172840431323434035L;
         final WireContents<ByteBuffer> buf =
                 converter.serialize(Long.class, input);
         assertNotNull(buf);