Bugfix: only clone the buffer, if requested