small improvement for JAWS version