Scoping fix