Hot fix 2 for `65f960d` (#203)