Fixed issue: Fixed bug of previous commit