Fix regression of 487b93956d407b1692b49c51c9e2bae7d36b3b65