Final bug fix!!!