hard fix for scope bug