BUG FIXES VER1.2