Fixed Bug #104