Fix bug from e42733c35d5bc4dda3b5a3e443d6f3df135824a7