Fixing decoding A LITTLE