Added data encoding, something got broken.