Fix task enhanced