Final working fix!