Upgrate to 2.0.7