Fixing the latest changes.