Please add an issue for this, so this is not getting lost.