Added small improvement