Fixing scope check