Fixed issue where tasks where being overwritten