now fixing older issues