Fix with tasks