Fixed an issue with the buffer not returning data