Better fix for moving stuff into an Executor.