0.0.4-git (alpha4) fix2