Might need to see if there is a way to do that in future