fixing task stuff