Fix 7957

This fixes #7957 (closed). Should be tested against other platforms where the error does not occur to make sure everything still works.

cc @Jehan @Wormnest.