Fix task controller