PG find bug fix