tools directory wrong wrappers Bugfix