Bugfix for handling context.io better