Reverted change made to scope check