Fixed issue with buffer size