fixed the Guido merge