Buffer size fix