Trying to fix buffer issue again!