Added workaround for missing build IDs