Fixed Bug #6