small improvement #2