Fixed buffer size from 574 bytes to 2080 bytes