Reverted default buffer size to 32