By @Killyana Closes #467 (cherry picked from commit 16179f8cf931d3f4530908134809005c79e638d8)
hotfixes