Corrected a bug caused by the previous commit