Reverted due to character encoding bug and not code bug