Fixed issue with generator not getting correct URL