Fix uses annotation
Fix encoding