added check for vanilla-off option