fix issue with blocks passing in PostgresHandler. Not testable