Attempted fix for (un-)bundled libraries