Fix PG issue