Fix potential scoping issue