fix last issus