Bugfix did not works, so removed