Fixed Bug #198