Remove comment
Make sure of returning the right encoding