Try to resolve generation2 issue