Added workaround for (#426596)