Fixing Zach comments #ref 13433077528738