* closes #2129 * by w1sht0l1v3 * deluce version by Killyana (cherry picked from commit b32a06c567241a7540fbad74c727e133bc1f9d87)
* closes #2129 * by w1sht0l1v3 * deluce version by Killyana (cherry picked from commit b32a06c567241a7540fbad74c727e133bc1f9d87)