Work with Strawberry 5.20.x issues