Why don't you connect with the makers of Madrid and see what they can do about it? That is sometimes the best way to fix these types of incompatibilities.