Final bug fix for now