Token hiding bug fixed