Move composition:none check to correct branch.