Fix scope ordering