This isn't tight enough. @coffeemug, do you have an alternate proposal?