Fixed an issue where globals weren't being picked up