experimental fix of issue 4787