Good idea, done in c1b0ff63