This is a nice one, could you please send it in another PR?