Fixed Bug #9