Let me add the "solid" tag again. I will rework my pull request.