Added workaround for incorrectly defined uuid's