Fix for subdirs_support universal check.