Fix glitch, also fix encoding