Corrected from comment #7. Kindly review this patch.