fixed more for postgres