Fix with latest changes