Let's try fixing this scoping issue