Added check for on tape