Okay, this seems to work.