Fixed small encoding issue, needs testing