almost works
Repair after migration to Postgre