Applied @MrYay patch [test]