Fix Marco's bug