Fixing the Integer encoding ...