Applying patch from Codeception/pull/812/files