Encoding source code declaration is now at right place...