Fix #7 long value layout bug