Fix #11453

Worked with @thatch45 on this. Should be good. Closes #11453.