Fixed Bug #183