Fix for task manager and Janeway problem