UCG to UAG conversion fixed!