All fixed (probably :P )
Finish Hotfix-0.1.2