#4022 takes care of that as well.