I have a similar problem with iBonds. I classify them as bonds and then manually enter a new u it price to reflect principal plus interest. I don't know any other work arounds but I’d like to hear from others.