Fixed bug caused by last commit