Use correct entry from global_storage