hotfixes for encoding issue