OCHAROCCA: Fix for Postgres