Small improvement in ampl-mode