Bugfix, handling of empty types