Temporary fix encoding