341 Fix encode