Implemented commit 18f05b3ae4 of f0o/glowing-tyrion