Already notified @kraman about this, if noone will take it I can look at this tomorrow.