Fix bug due to last commit