Hopefully fixed random encoding issue