Patched 3eecb05fed4007e671cc6210ad10c12cae707a17 [3eecb05]