Fixed Bug #3