Bugfix for "make generic".