dirty hack for now to get the cli tasks working