removed BUFFSIZE hack