adapt to -Faldormain changes