Reapply modifications
Fix encoding