Created by: Exxion
Fixes #11674 (closed) Sorry if this conflicts, Sood, but it's kind of an important fix