v1.0.8: Fixes control
Former-commit-id: 3b8b43adf92c6ae98eaaacf2ded9db11c4851b1c [formerly c6ad21c26f0d292112c5b6fd8158185db640d802] Former-commit-id: 3b8b43adf92c6ae98eaaacf2ded9db11c4851b1c Former-commit-id: da86233a76a8aed7772f4fc37ff33fc7700cff6f