Fixed some tape cases