BUG: Fix issue caused by the previous commit efee6a8c936e54b2af9254e97f6f86b8235eed24