Bugfix buildUnit