Fixed where scope is applied