Fixed a bug caused by the error fix (last commti)