0.0.4-git (alpha6) fix3