Fixed token update conditions