Remove buffer size adjustment
Fixing entry point