fix buffer issue? maybe