eddyb: ive been meaning to do something like that, or merge that pull request