Deal with partially composite profiles to fix #9