Fixed more bug