correct widget forward logic
correct widget forward logic