More scope fixing