Using updated 3.0.6 source