Yes, this is something we have to change in Elucidator. Will add a card.