Fixed PostgreSQL related issue