Another small improvement