preliminary fix for https://projects.syslab.com/issues/6926