I don't like it either but this was the best (fast) working solution I found. It's a hotfix and I accept patches.