Attempted hacky fix for context leak