Output buffering fix