Another try to fix issue 7059, which should also fix issue 7049