I think this handles #362