Fix issue with PG "feature"