Added option to turn off tape allocation (fix 2)