Nicer #
Fix case where buffer already exists.