Hotfix/Patch I-117037

@indytechcook - per your request for I-117037