fix for global usage bug #35