Fixed name clash introduced (tested ;)