WIP fixing missing global