Modified per Jai's comments #1422