better but not fixed