Yeah I was afraid we'd have to introduce a hack. But it's better than nothing. Could you make a pull for this? Thanks.