Fixed Bug #1