Yes, however this is a more significant change than I want to make right now. I will file a ticket for that work.