Fix for custom domains