Removing this scoping issue