part of the fix for #7