Fixes global context usage