better bundle checks