extra fix for the scoping