Iss2451

Patch implemented for Issue 2451