Fix

Was crashing because of buffering issues.