Your absolut right. I improved the code with commit b8aedf9479e2cda808b9bba639f00342e2c07a49