Fix: Regression detected by phpunit