Bug fix for reading & buffering.