Please review the patch added in comment 17