Add buffered solution for #272