Fixing scope condition