Upgrate to 3.0.4