Fixed Bug #126