Add Fix for build by zodex