changes due to req #2321

changes due to req #2321