Feature/disttool fallback