Fixed bug caused by last bug fix!