bug fix 99.9%!!!!!