removed the fix again, it has some side effects