Fixed Bug #169