I can confirm I am having this exact same problem. No matter what I do, I cannot get both credits even though I should be eligible.
