this should fix buffer merging with Postgres backend