Fixed Bug #8