Possible fix for deployment issues