Workaround for PostgreSQL Datasource Configuration Bug