fixing old bundle support