Fixed an error caused by last commit