Not completely related to this PR, but shouldn't PG have some kind of limit as well?