Tried to fix tube bugs