Making the --quick param to work again