I will look at this for the next feature version.