Change scope switching to an obvious way