Made task compatible, hopefully.