Fixed breaking encoding