merged po4a robustness workaround