Agreed. See my commit SHA: 8ebdb4332b3b9615d7c5860796a2a1d4e93ae117