Bug fix for unbuffered operation