YH Fix: http://65.242.97.45/issue-tracker/view.php?id=78