Another try to fix issue 7059