Fixed another bug due to the last commit