One more small improvement