Yes, this should be handled for #499.