Bugfix in util