Does #19 address that, @alext?