Fixed Bug #2