Fix with name variable