Fix task listener