Created by: szhu
Fixes #7651 (closed)
Haven't tested it yet, if someone can do that then that would be great!