Fixed more issue