Added 'fix' of scope problem