Extended fix to popularity scope