Added extra check for bustOnly.