Fixed the error caused by the last commit