Fix for some attribute validation skipped in conjunction with mc_include