Attached a patch that fixes bug 23124.

Cheers,

Dan