still messing with encoding

Change-Id: I4b23508c0b2870dbaf75824668d280c4844aae33